From bf61172278d95546c69d832c860338eda3f6ccba Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 22 Jun 2007 11:48:49 -0600 Subject: [PATCH] [IA64] clean warnings This effectively reverts the io_init.c changes from ia64/xen-unstable.hg cset 15376:39a95178edbf Signed-off-by: Alex Williamson --- xen/arch/ia64/linux-xen/sn/kernel/io_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c index 471d404bdf..ca0b66d0d8 100644 --- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c +++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c @@ -182,7 +182,6 @@ sn_pcidev_info_get(struct pci_dev *dev) } return NULL; } -#endif /* Older PROM flush WAR * @@ -362,7 +361,6 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count, controller->window = new_window; } -#ifndef XEN void sn_pci_unfixup_slot(struct pci_dev *dev) { struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev; @@ -658,7 +656,9 @@ void sn_bus_free_sysdata(void) static int __init sn_io_early_init(void) { int i, j; +#ifndef XEN struct pci_dev *pci_dev = NULL; +#endif if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM()) return 0; -- 2.30.2